[StatusIconDispatcher] Add keyboard and display icons to tray icon list

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1f05710a1a158e7363a6dba27cf3b6857872d351..9f317deb13de64373a0ddf86e1b47b0ad0e145c9 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -29,7 +29,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_UPDATE_TIMEOUT = 130;
 const SPINNER_SPEED = 0.02;
 
-const STANDARD_TRAY_ICON_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
+const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
 const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
     'a11y': imports.ui.status.accessibility.ATIndicator
 };

diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js
index 85d7ffefbfa1033baddc403928fee696e5679aa1..fc754c9f4a4339edadf90cb8ad83c4e6692d4e2c 100644 (file)
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -11,7 +11,9 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
     'bluetooth-applet': 'bluetooth',
     'gnome-volume-control-applet': 'volume',
     'nm-applet': 'network',
-    'gnome-power-manager': 'battery'
+    'gnome-power-manager': 'battery',
+    'keyboard': 'keyboard',
+    'gnome-settings-daemon': 'display'
 };
 
 function StatusIconDispatcher() {